home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
The CICA Windows Explosion!
/
The CICA Windows Explosion! - Disc 2.iso
/
nt
/
vdifmrgn.zip
/
EXAMPLE
/
SECOND.TXT
< prev
Wrap
Text File
|
1995-06-16
|
1KB
|
30 lines
VDIFMRG - Visual Diff and Merge version 1.0
Visual Diff and Merge (VDIFMRG) is a software developer's tool for
finding and displaying the differences between two versions of a
this line has been added to the second file
source file, and for merging separate changes made to copies of the
same source during concurrent development.
VDIFMRG is meant to be useful by itself, or in conjunction with a
software configuration management tool which can automatically detect
conflicting source file changes during a "check-in" or related operation.
The VDIFMRG graphical interface utilizes color and symbols to distinguish
changes by type or origin, and this use of color allows the merge interface
windows as do some merge tools. The merge function also attempts to perform
an accurate merge prior to displaying the result, thus reducing the user's
task THIS LINE CHANGED IN THE SECOND FILE and resolving any conflicts (which
are automatically detected and indicated).
VDIFMRG is a shareware product of:
Robert Alan Wright
Alberta Software
1194 Johnson Ave.
San Jose, CA 95129
alan@netgate.net
alan@netcom.com
Please see the help file for registration and usage information.